Test
Tester
Merge branch 'master' of https://github.com/varunmayya/polled

Conflicts:
	app/assets/stylesheets/polled.css.scss
Merge branch 'master' of https://github.com/varunmayya/polled

Conflicts:
	app/assets/stylesheets/polled.css.scss
Hope!