Added files and stuff
Merge branch 'staging' of https://github.com/Saba9/mapmaker