Pre pull backup
Merge branch 'master' of https://github.com/daniel-cheng/flask_webapp

Conflicts:
	static/stylesheets/stylesheet.css
changed webpage, css