updated README with homework instructions in md format
reformatted README
added Tag model and tests
added other side of HABTM relationship w/ Tag to Question (left out of earlier commit
added Comment model and tests
gotta go, hope to complete this later this evening
change to vote test
merged conflicts
added wireframe pdf to root of project
created controllers; wrote failing tests for question controller
created controllers; wrote failing tests for question controller
very minor update
pulled changes from remote and manually merged
removed lots more merge conflicts
merged changes from upstream
added heroku stuff
added unicorn config
added Procfile
 moved unicorn.rb to correct directory
merged pull from upstream