Maps
Merge branch 'master' of github.com:annejse/codess_hackathon

Conflicts:
	index.html
	js/GameEngine.js
	js/main.js
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#   (use "git push" to publish your local commits)
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   js/GameEngine.js
#	modified:   js/main.js
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/
#	bower_components/