Added styles, doctype html4
Merge branch 'master' of https://github.com/summerisgone/test_mergetool

Conflicts:
	templates/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/index.html