secondcommit
Merge branch 'master' of http://github.com/PraveshKoirala/IOESTS

Conflicts:
	ioests/ioestu/endofday.pyc
	ioests/ioestu/urls.pyc
	ioests/ioestu/views.pyc