added missing colon to a migrate file
Merge branch 'master' of github.com:dkulas/GIFTY
minor changes
login and signup forms
Merge pull request #8 from JackVCurtis/master

added login and signup views
updating files/folders
Delete .DS_Store
Views and Gemfile updates
Merge pull request #9 from auroranou/master

add app.rb
Merge branch 'master' of github.com:dkulas/GIFTY

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