blah
Merge branch 'master' of http://github.com/hacktheuniverse/constellation-deformation

Conflicts:
	delorean/app.js
	delorean/index.html
adding things and learning to git