Update
Merge branch 'master' of https://github.com/Danielhe280/ExtraBrainTesting
Update
Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/alexander/extrabraintesting/Activity/MainActivity.java
	app/src/main/res/layout/time_list_item.xml