add content for login page
fix bug
check return dat
merge conflict
Merge branch 'master' of https://github.com/streamslide/cookpad-contest
re add audio control and remove clock