gitignore
prototype
Merge branch 'master' of github.com:martinfilliau/timetracking

* 'master' of github.com:martinfilliau/timetracking:
  Initial commit

Conflicts:
	.gitignore