sdfdsf
Merge branch 'master' of github.com:BLNorris/flipbook

Conflicts:
	app/assets/stylesheets/users.css
added form styling for creating new flipbooks
borders, borders everywhere!
Merge pull request #41 from BLNorris/flipbooks_styling

Flipbooks styling