Merge pull request #1 from Cheeseum/master

Physics Adjustment
new stuffs
Merge branch 'master' of github.com:KaeruCT/short-experiments
ooops
reorganized stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	glxy/main.js