added stuff for database
Merge branch 'master' of github.com:maurish/Ohtu-miniprojekti