Redesigned buttons
Merge branch 'jamie' into shannon

Conflicts:
	client/index.html
Final merge with shannon
Moved name to new line
Merge branch 'shannon' of github.com:h0dgep0dge/artemis into shannon
Merge branch 'jamie'

Conflicts:
	client/style.css