Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2016-04-13 10:36:00 -07:00
commit b5fc0650c6

View file

@ -14,6 +14,7 @@ github_username: jeffpar
left_brace: "{"
right_brace: "}"
encoding: UTF-8
# Build settings