DeadException
Merge branch 'first_sprint' of https://github.com/Jonate/Dat255-CrayCray into first_sprint

Conflicts:
	CrayCray/src/se/chalmers/dat255/craycray/model/NeedsModel.java
Merge branch 'first_sprint' of https://github.com/Jonate/Dat255-CrayCray into first_sprint