commit
New gui components
More Gui Changes
timer integrated
commmitted
Finished two of the timing fragments GUI
fixed lock bug
Login functions working
Merge branch 'master' into jennifers-branch

Conflicts:
	.idea/workspace.xml
	app/src/main/java/com/hackthenorth/lockmeout/app/HomeActivity.java
Merge branch 'jennifers-branch' into branch_g

Conflicts:
	.idea/workspace.xml
	app/src/main/java/com/hackthenorth/lockmeout/app/HomeActivity.java
	app/src/main/java/com/hackthenorth/lockmeout/app/HomeFragment.java
Merge remote-tracking branch 'origin/branch2' into branch_g

Conflicts:
	.idea/workspace.xml
	app/src/main/java/com/hackthenorth/lockmeout/app/HomeActivity.java
	app/src/main/java/com/hackthenorth/lockmeout/app/LockPhone/EndTime.java
	app/src/main/java/com/hackthenorth/lockmeout/app/LockPhone/StartTime.java
	app/src/main/res/values/strings.xml
updated gitignore
updated gitignore
hackthenorth build