just try

try
Merge branch 'temp' of https://github.com/drinking/isite
Merge branch 'master' of https://github.com/drinking/isite

Conflicts:
	static/css/isite.css