Merge remote-tracking branch 'refs/remotes/origin/master' into docs

This commit is contained in:
Michael Elliot Braun
2016-05-11 13:39:05 -07:00
12 changed files with 134 additions and 101 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 17 KiB