Removed debug lines from main.c
Removed debug lines from main.c
Merge branch 'robbie' of github.com:h0dgep0dge/artemis into robbie
Properly aligned button text
Created empty docs in the doc directory
Added docblock to index.html
Renamed doc files to *.md
Removed *.doc
Added node.js dependencies
Added magic number support to main.c
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