Added css, more pictures, and edit some previous jsp files
Merge origin/master

Conflicts:
	Cantus/web/AddASong.html
pushed my stuff