analyst: first templates;
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/css/style.css
hmm... where is my commit?