i also dunno what i commit
Merge branch 'master' of github.com:mauriceteo/EME

Conflicts:
	app/assets/stylesheets/bootstrap.css