Merge pull request #2 from wishmaster2016/master

adaptivity fix
readme edit [4]
Merge pull request #3 from wishmaster2016/master

added main menu, game over screen and other fixes
ngTap fix
ngTap fixes
marge fix
Merge branch 'wishmaster2016-master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/js/app.js