nothing
Merge remote-tracking branch 'origin/master'
images in details
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/android/DetailsActivity.java
Merge remote-tracking branch 'origin/master'
added ingredients image
Merge remote-tracking branch 'origin/master'