Improve layout
Merge branch 'master' of github.com:ace-your-place/festival-of-code
removed random function
add merge data
commit all
fix merge