change to readme.md
Merge pull request #3 from nicholalexander/whatever

change to readme.md
fix merge conflict with aby
Update README.md
adjusted the proposal
Merge pull request #5 from nicholalexander/proposal

Adjusted the Proposal
initial commit
added bcrypt, pry, and foreigner gems to gem file
users, questions, upvotes, and comments tables cmigration created.
migration run/schema file update
move rails app up one directory for heroku deploy and edit readme.md
resolving merge conflict
added paused and dismissed to questions table
Update README.md
Merge pull request #7 from nicholalexander/updateQuestionsTable

added paused and dismissed to questions table