Add comments
Fix conflicts
Merge branch 'gameSkeleton' of github.com:aarya123/FlapJack into gameSkeleton