syncing...
syncing
Merge branch 'master' of https://github.com/mseln/yolo-octo-wallhack

Conflicts:
	Notes/tidsrapport.txt
	lmap/mapvis/views.pyc
added .gitignore, removed all *.pyc