Initial commit
Merge branch 'master' of github.com:stefanKuijers/project

Conflicts:
	README.md
ignore project files
Merge branch 'master' of github.com:stefanKuijers/project

Conflicts:
	.gitignore
persistencejs quickanddirty added for settings page
Merge pull request #41 from Hikariii/feature/orm

Feature/orm