schema.rb
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
initial commit for multiple pictures
database set up for multiple images
merge conflicts fixed
Merge branch 'master' of github.com:StephanMusgrave/ProjectX

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
fixed links to listing from user profiles
refactored tests
merge conflict
updated
Schema conflict fixed
merge conflicts