add stuff
Merge branch 'master' of github.com:Gaming4Life/frontend
add stuff
Merge branch 'master' of github.com:Gaming4Life/frontend

Conflicts:
	app/index.html