ugly. but it's a start.
Merge branch 'master' of github.com:chaserx/meteoric_scale

Conflicts:
	README.md