STUFFKJWQLKJQWELKJ
Merge branch 'master' of https://github.com/brycekahle/gpp

Conflicts:
	2014/public/assets/logo.png
Merge branch 'master' of https://github.com/brycekahle/gpp