first commit
Merge https://github.com/joakimsehman/Spelprojekt-sommar-2014