switched to ejs instead of manual templating
Merge branch 'develop' into feature/ejs

Conflicts:
	client/join.html
Merge pull request #8 from jpoker/feature/ejs

switched to ejs instead of manual templating