discover page
ooutting composer n css back in

after git hub got rid of them
what is git hub doing
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/evercise.css.less
	app/composers.php