Initialise Django structure
Initialise Django structure
Merge branch 'master' of github.com:Sheepzez/terror-search

Conflicts:
	HaskellTest.hs