almost done with editing a listing
Merge branch 'Listing' of github.com:StephanMusgrave/ProjectX
still working on editing
Merge branch 'Listing' of github.com:StephanMusgrave/ProjectX
Edit cucumber tests pass
delete listing cucumber test in progress
delete listing tests in progress
added prototypes, created with Balsamiq
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Delete button works
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
fixed add listing ommision
Merge branch 'user_profile_page'

Conflicts:
	.DS_Store
	config/routes.rb
	db/schema.rb
fixed delete listings merge conflict
sorting merge conflicts
authenticate user added to user profiles. step def ambiguation fixed
two correctly failing cucumber tests, about to implement
two correctly failing cucumber tests, about to implement
Can only change your own profile picture
Merge branch 'master' of github.com:StephanMusgrave/ProjectX