Merge branch 'master' of https://github.com/yawboakye/simpoll

Conflicts:
	app/assets/stylesheets/welcome.css.scss
	app/views/layouts/homepage.html.erb
specific style for homepage, only

Conflicts:
	app/assets/stylesheets/welcome.css.scss