styles edit question form
Merge branch 'master' into styling

Conflicts:
	app/views/questions/show.html.erb
Merge pull request #24 from Cheerazar/styling

styles edit question form