Pushing
Merge branch 'master' of https://github.com/EasternHeart/sphinx-igem

Conflicts:
	dosui.php
Fixed conflit