Merge latest changes on master branch to dev branch #1

Merged

sixteenmillimeter merged 3 commits from master into dev

2017-09-28 17:30:53 +00:00

Author	SHA1	Message	Date
Matt	0e134cfa6a	Reference correct project in nginx.conf Was also bugging me.	2017-09-28 13:29:15 -04:00
Matt	e876359be8	Clean up whitespace in nginx.conf It was bugging me	2017-09-28 13:28:14 -04:00
mmcwilliams	399b623db4	Only use a 5 gzip	2017-08-29 07:35:23 -04:00