turns and shit
Merge branch 'master' of https://github.com/Folashade/hw4-webapp

Conflicts:
	data/data.txt
	data/users.txt
	static/css/style.css
	static/game.html
Merge branch 'master' of https://github.com/Folashade/hw4-webapp

Very Nesessary