cleaning repository
Merge branch 'master' of github.com:maxbortone/qbot

Conflicts:
	app/views/questions/_form.html.erb