Merging my latest changes to the master branch
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
cehcking for david's update
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
Merge pull request #22 from dabeeya/master

git commit -m'added firstname, lastname, bio to user and fixed question controller'
save before pulling
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	config/routes.rb
	log/development.log
commit before pull
Merge pull request #24 from dylanerichards/master

.
continueing to make small design tweaks
Changed ask question link so it created a JS form
continuing to tweak the show page
removed files blocking my pull from github
merging the upstream master
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
updated style sheet
add hidden field to comments form to deal with params
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
a couple more minor design updates
Merge pull request #25 from dylanerichards/master

add hidden field to comments form to deal with params
a bunch of none need files deleted
merging all the changes
Fix answer not being attached to user.