Update 2
Merge branch 'master' of github.com:niberic/SACSHPE-Hackathon

Conflicts:
	README.md