Update dev
Merge branch 'dev' of https://github.com/zpfled/guevaras into dev

Conflicts:
	development.db
comment out user.create
Bundle update
Comment out line that was causing boot error
fixed rack sessions for deployment
fixed rack sessions for deployment
changed bcrypt
sorry I accidentally reset the database again
submenu.erb
menu.erb
layout
index.erb
footer.erb
admin.erb
main.css
update images
chicken fingers
js
db update