Some new stuff?

I guess I haven't updated this in a while -- nor have I really worked on it so much.
Merge branch 'inertia' of https://github.com/ghettosoak/Object into inertia

Conflicts:
	.DS_Store
	front/css/master.css