random fixes and hacks
Merge branch 'master' of https://github.com/AVUIs/EsoterionUniverse

# By Will Gallia
# Via Will Gallia
* 'master' of https://github.com/AVUIs/EsoterionUniverse:
  Update README.md
  Update README.md
  you can now edit objects

Conflicts:
	src/ofApp.cpp