styled index and forms
merging styling branches into one
Merge branch 'master' into actual_styling_do_not_merge_other

Conflicts:
	app/assets/stylesheets/layout.css.scss
	app/assets/stylesheets/questions.css.scss
database reset to resolve password salt issue
Merge pull request #20 from elenasharma/resolved_styling_merge_conflicts

Resolved styling merge conflicts; merged Tali's styling work