added whatever. probably wont use it
Merge remote-tracking branch 'origin/master'

Conflicts:
	Activity/src/activity/Render.java