not bad looking
Merge branch 'master' of https://github.com/bebensiganteng/simplephysics

Conflicts:
	.gitignore