first commit
Merge branch 'master' of https://github.com/clicker360/ebf2013

Conflicts:
	README.md