fix scrolling
Issue #240 , fix css and scrolling
Merge branch 'competition' of https://github.com/DevYah/coolsoft-13 into competition

Conflicts:
	Idearator/app/assets/stylesheets/competitions.css.scss