asdf
Merge branch 'master' of github.com:xenoryt/FinalProject2013
Finished map rendering