Merge branch 'master' of https://github.com/powerdbyintellect/SparkLessons

Conflicts:
	SparkLessons/src/main/java/com/intuit/tutor/CustomerController.java