a git pull from upstream to get latest files
created users with devise and added routes and views for user profiles
ran AddUserIdToCommetables migration to create user associations
Merge pull request #4 from dylanerichards/master

Devise Users, User associations
added sign up/in buttons to navbar to make registrations/sessions available
Merge pull request #5 from dylanerichards/master

added sign up/in buttons to navbar to make registrations/sessions availa...
added create a new question button when signed in
Merge pull request #6 from dabeeya/master

added create a new question button when signed in
display answers on question show view
merge conflict of PagesController resolved
added form to new and edit Question views
Used acts_as_votable gem to allow users to vote on questions
fixed create controller for questions so that they can be created successfully
Merge pull request #7 from dylanerichards/master

Can create questions
Add log files to pull changes
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	log/development.log
	tmp/pids/server.pid