Merge pull request #27 from JBrianGordon/jamesbranch

adds BCrypt code to user model
fixes login, removes password column
users can only edit own submissions in controller
tries to fix a git problem
takes the photos out of the last commit
tries to fix the image pushing problem again
Merge pull request #28 from JBrianGordon/kellybranch

tries to fix a git problem
adds in some user info on a particular submission
changes the git ignore