local changes (kaktus)
Merge branch 'master' of https://github.com/andimeier/timetracker

Conflicts:
	server/app/models/record.js
nach gepullt
Merge branch 'master' of https://github.com/andimeier/timetracker

Conflicts:
	.gitignore