create model tests for user and add validations
added gravatar to profile page, added ability to add maps to any page
Merge branch 'master' of https://github.com/rickytux/DBCoverflow into gravatar
"gravatar"
create passing create user tests
Merge pull request #35 from catherinev/gravatar

Gravatar
fixed user rb merge conflict - kept validations
Merge pull request #36 from catherinev/create_user_tests

Create user tests
not finished with search in this one yet]
removing empty features-answerspec file
deleting stupid empty answer_spec rb file
Merge branch 'master' of https://github.com/catherinev/OurProject into create_user_tests
merged with master
Merge pull request #37 from catherinev/create_user_tests

Create user tests
Merge branch 'master' of https://github.com/catherinev/OurProject into search2
add commit
i Please enter a commit message to explain why this merge is necessary,
fixed gemfile
delete mistaken search_controller
last try then I'm throwing my computer out the window
added elasticsearch to travis.yml
another searches spec deleted
Update README.md
Merge pull request #44 from catherinev/search2

Search2