Update .gitignore
Update .gitignore
Strings for the first pages
Added first pages for login and sign up
A whole lot of things
lol
Sprint 1 DAO, Login, done
Merge branch 'master' of https://github.com/dstoreng/workhours.git
Merge branch 'master' of https://github.com/dstoreng/workhours.git
Merge branch 'b2'

Conflicts:
	WorkHours/res/values/strings.xml
	WorkHours/src/com/example/workhours/MainActivity.java
	WorkHours/src/com/example/workhours/ShiftActivity.java
	WorkHours/src/com/example/workhours/entities/CalendarDAO.java
	WorkHours/src/com/example/workhours/entities/Shift.java
Conflicts resolved and b2 merged with master branch