LOOOOL
Merge branch 'master' of github.com:Tomazz/Hackdemo

Conflicts:
	README.md
Merge branch 'master' of github.com:Tomazz/Hackdemo