Just a change, as requested
Merge branch 'master' of git://github.com/amirian28/hackathon

Conflicts:
	README.md