swag
omg
profile
up
Merge branch 'chisselisse'

Conflicts:
	WorkHours/res/menu/main.xml
	WorkHours/res/values/strings.xml
	WorkHours/src/com/example/workhours/InitScreenActivity.java
	WorkHours/src/com/example/workhours/MainActivity.java