initial commit
Merge branch 'master' of github.com:nguillemot/uvicgamejam14

Conflicts:
	README.md