Add conditional CSS for IE7
Merge branch 'master' of github.com:teampopong/pokr

Conflicts:
	templates/layout.html