animating wooooo
the animated things
Merge pull request #26 from BLNorris/mps

Mps
Merge branch 'master' of github.com:BLNorris/flipbook into usersnstuff

Conflicts:
	app/views/flipbks/show.html.erb
merged
fixed some merge stuff