FIXING ALL THE CSS
Merge branch 'master' of github.com:vineetgopal/minimaestro

Conflicts:
	minimaestro/templates/base.jade
	minimaestro/templates/index.jade
Merge branch 'master' of github.com:vineetgopal/minimaestro