Fixed warnings, tried some html changes.
Merge branch 'master' of https://github.com/scottlow/seng422

Conflicts:
	client/app/views/client.html