no message
Merge branch 'master' of https://github.com/doheekim/chuizonetest

Conflicts:
	app/__init__.py
no message