Merge branch 'master' of https://github.com/Xatter/mockingjay

Conflicts:
	app.py
	app/views/main.html