resolved merge conflict
merge conflict resolved
Merge branch 'master' of https://github.com/Jamanius/GIFTe

Conflicts:
	app/views/gifts/index.html.erb
added image field to gift table. Pushed immediately to master