nav bar & footer
Merge branch 'bootstrap_spike' of https://github.com/tiger-swallowtails-2013/Fashion_Forward into bootstrap_spike

Conflicts:
	app/views/layouts/application.html.erb
moved add question button so that the form would work
improve design of questions index to include accordian styling
Merge branch 'master' of https://github.com/tiger-swallowtails-2013/Fashion_Forward into bootstrap_spike_sk

Conflicts:
	app/views/layouts/application.html.erb
no user css needed at this time so removed stylesheet
login/signup
fix merge conflict on image size
Merge pull request #19 from tiger-swallowtails-2013/bootstrap_spike_sk

Bootstrap spike sk