no message
Merge branch 'master' of https://github.com/Hogoonn/chuizonebeta

Conflicts:
	app/templates/new_index.html