users controller fix
deleted stock readme
setup basic form to make flipbook
new stuffs
Merge branch 'master' into animator

Conflicts:
	config/routes.rb