starting on styles
removed old template stuff
Merge branch 'master' into seb-styles

Conflicts:
	client/main.jade
fix main naming problem