Adding Collage
Merge branch 'gh-pages' of https://github.com/PlantBuilder/thinkful into gh-pages

Conflicts:
	FlipiPedia/js/jquery.wikipedia.js