set location to base if at base
Merge branch 'master' of github.com:ShadowKoBolt/hackmanc14