gitignore
Merge branch 'master' of https://github.com/Quasineation/cabinwebproject.git
Closed a file scanner and checked the cabins
Merge branch 'master' of
https://github.com/Quasineation/cabinwebproject.git

Conflicts:
	src/no/uib/info216/cabinproject/controller/MainController.java
	src/no/uib/info216/cabinproject/dao/CabinDao.java
	src/no/uib/info216/cabinproject/parser/WeatherPlaceParser.java