Uploading to git..
Merge branch 'master' of https://github.com/OskarHandmark/Manhattan-Planner