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
updated
Schema conflict fixed