aa
Merge branch 'master' of https://github.com/birch0930/assignment1.git

Conflicts:
	.gitignore
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/m2e-wtp/web-resources/META-INF/maven/timesheet/timesheet/pom.properties