capybara removed for upload
capybara removed for upload
updated key info
fix heroku
ahh
asf
gemlock
conflicts
faker fix
asf
asf
too many style sheets
asdf
conflicts
conflicts
asdf
solved error message for password with less than 8 characters
style
fade in form
Merge branch 'dev' of github.com:JAdshead/photo_app into dev