Stlying
changing to styl insteand of less
erge branch 'master' of github.com:fayeli/WildHacks2k14

Conflicts:
	public/stylesheets/style.css
	public/stylesheets/style.less

:wq