just getting latest
Merge branch 'master' of https://github.com/AllTrips/glory-bowl

Conflicts:
	.tmp/404.html
	.tmp/500.html
testing github funky funk