added missing colon to a migrate file
Merge branch 'master' of github.com:dkulas/GIFTY
updating files/folders
Views and Gemfile updates
Merge branch 'master' of github.com:dkulas/GIFTY

Conflicts:
	.DS_Store
Merge branch 'master' of github.com:dkulas/GIFTY
item_display erb file