Had a problem merging Gemfile.lock - so copied and deleted to merge
Merge branch 'master' of github.com:ITintheD/ItInTheD
Added testimonial page framework
added testimonials framework
added pages

Conflicts:
	Gemfile.lock