fixed linked_to form to get new answer page
fixed merge conflicts
started profile page
Merge pull request #20 from dylanerichards/master

fix merge conflicts. remove 2 unnecessary @question.body from show view
File not required bc of bootstrap CSS
moveing much of the CSS to application.css.scss
because of how rails works
This is the file required for correct CSS styling with bootstrap and rails
more styling changes to homepage
updating the style for the pages more
nav bar still requires additional fixes
merging all changes
small change after the merge
Merge pull request #21 from vivekmgeorge/master

My design updates
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
changed the answer body field to text from string
changed based on previous commit
continues changes to make design look better
trying to get the show make look perfect with multiple answers
removed the development log file from git tracking