Cleaned up
Merge branch 'master' of https://github.com/RubenRME/Frackets

Conflicts:
	README.md