add
Merge branches 'master' and 'master' of github.com:FScoward/Idea

Conflicts:
	README.md