"new stuff"
halalMerge branch 'master' of https://github.com/lememta/ways2go

Conflicts:
	dummy_data.py