for merging
Merge branch 'master' of https://github.com/ristes/apple-game.git
styles with angular integration