old files
Merge branch 'master' of https://github.com/JBLowrie/Juliett

Conflicts:
	src/main/webapp/css/juliett.css
Merge branch 'master' of https://github.com/JBLowrie/Juliett