Updated README to mention IntelliJ
Merge branch '2.0_unit_test'

Conflicts:
	README.md