trying to fix merge conflict with loading.js
recommitting css changes due to loss of changes in stash; just updating look of note buttons
Merge branch 'master' into css

Conflicts:
	js/loading.js
Merge pull request #31 from artfoundry/css

Css