initial commit
Merge branch 'master' of github.com:sorpaas/timeana

Conflicts:
	.gitignore