done!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	OlinChallenge/src/main/java/com/mobpro/olinchallenge/MainActivity.java