some changes
Merge branch 'master' of https://github.com/mydylan/Magic

Conflicts:
	app/assets/stylesheets/main.sass