file baru
dari mac
commit dari win dg hehe
Merge branch 'feature/wo123' of https://github.com/waindo/timesheet into feature/wo123

Conflicts:
	a.text
Merge branch 'feature/wo123' into develop
Merge branch 'release/v1.0'
ok a.text
Merge branch 'hotfix/v1.0.1'