Primary User Stories completed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	tipcalc/src/main/java/com/codepath/example/tipcalc/tipcalc/MainActivity.java