First commit
Merge branch 'master' of https://github.com/Blole/DD2438-2014-assignment2