Merge remote-tracking branch 'origin/patrick'

Conflicts:
	app/src/main/java/com/primo5/habits/MainActivity.java
	app/src/main/res/layout/activity_main.xml