Initial commit
working timer.jade page using socket.io
more testing
Merge branch 'master' of https://github.com/will-harrison/wholeHouse_socket

Conflicts:
	.gitignore