Moving things around
Merging some changes
Merge branch 'master' of https://github.com/kkozarev/spaceaid