fixed linked_to form to get new answer page
fixed merge conflicts
started profile page
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid
trying to pull upstream
added firstname,lastname, bio to user and fixed question controller
log is added to commit
delete log
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

.
merging the upstream master
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
updated style sheet