Implemented PricedSafe and begin PricedRoom
Two lines added to PricedRoom
Merge branch 'sophie' of https://github.com/Kurocon/softwaresystemen into sophie

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/ss/.indexes/e4/60/be/b4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ss/.indexes/e4/60/bf/b4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ss/.indexes/e4/60/bf/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ss/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ss/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/ss/2013/11/48/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/ss/2013/11/48/refactorings.index
	ss/bin/ss/week2/hotel/Password.class
	ss/bin/ss/week2/hotel/Room.class
	ss/bin/ss/week2/hotel/Safe.class
	ss/bin/ss/week2/test/HotelTest.class
	ss/bin/ss/week3/Format.class
	ss/bin/ss/week3/hotel/Bill.class
	ss/bin/ss/week3/hotel/BillItem.class
	ss/src/ss/week2/hotel/Password.java
	ss/src/ss/week3/Format.java
	ss/src/ss/week3/hotel/Bill.java
	ss/src/ss/week3/hotel/BillItem.java
Fixed merge conflicts
Merge branch 'kevin'
Merging changes
Merge branch 'sophie'
Merging new changes for sophie
PricedRoom and PricedSafe
Fixed week2.hotel
Removed .metadata and added .gitignore
Delete .gitignore~
Sophie werk
Moar
Fixed gitignore
Merge branch 'sophie'
Merge remote-tracking branch 'origin' into kevin