Properly aligned button text
Added docblock to index.html
Add websocket transmitting from the remote
Properly aligned button text
Added docblock to index.html
Scaled up, corrected alignment
Merge branch 'shannon' of github.com:h0dgep0dge/artemis into shannon

Conflicts:
	client/style.css
Add error checking, fade in
Merge branch 'shannon' of github.com:h0dgep0dge/artemis into jamie
Aligned circle buttons
Merge branch 'shannon' of github.com:h0dgep0dge/artemis into jamie
Add swiping between things
Properly aligned button text
Added docblock to index.html
Add websocket transmitting from the remote
Properly aligned button text
Scaled up, corrected alignment
Add error checking, fade in
FUCKING GIT HATES ME AHH FUCK
FUCK GIT FUCK FFUCK FUCKKKK

Conflicts:
	client/script.js
	client/style.css