Json models

Commit to master
Json models

Commit to master
Merge branch 'master' of https://github.com/Danielhe280/ExtraBrainTesting

Conflicts:
	.idea/inspectionProfiles/Project_Default.xml
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/alexander/extrabraintesting/Activity/LoginActivity.java
	app/src/main/java/com/example/alexander/extrabraintesting/Activity/TimeActivity.java
	app/src/main/res/layout/activity_time.xml
	app/src/main/res/values/strings.xml
Merge branch 'Danielhe280-master'