merge dummy
Merge branch 'master' of https://github.com/nkp/hackkings

Conflicts:
	dummydata.py
Merge branch 'master' of https://github.com/nkp/hackkings