added footer
Merge branch 'master' of github.com:angelaz/shine

Conflicts:
	client/shine.css