created project in NetBeans, successfully connected to database
Merge branch 'javadb'
commit before merge
Merge branch 'master' of https://github.com/aydex/IT1901-Gruppe11

Conflicts:
	.gitignore
Merge branch 'javadb' of https://github.com/aydex/IT1901-Gruppe11
Merge branch 'javadb' of https://github.com/aydex/IT1901-Gruppe11
Small changes
La til tabell med reservasjoner
Merge branch 'master' of https://github.com/aydex/IT1901-Gruppe11
Program no longer crashes when connection to db cannot be made
Merge branch 'master' of https://github.com/aydex/IT1901-Gruppe11