first
ignore
stupid idea files
GA
cleanup
more cleanup
more cleanup
arggghhh
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
	index.html
	js/main.js