More style changesssss
Merge branch 'master' of github.com:buhhy/scheduler
amar smellz
Merge branch 'master' of github.com:buhhy/scheduler
Stuff
Merge branch 'master' of github.com:buhhy/scheduler

Conflicts:
	public/css/editor.css