Added some physics
Added time to physics
Merge branch 'master' of https://github.com/astralien3000/tinySASIAE

Conflicts:
	mainwindow.ui