changes
Merge branch 'gh-pages' of github.com:tylerlamonda/website into gh-pages

Conflicts:
	index.html