Merge branch 'master' of https://github.com/MaiHo/Chirps-Web

Conflicts:
	chirps/app.py
	chirps/static/css/style.css