Commit Test 2
resolved conflict
Merge branch 'master' of https://github.com/danielglennross/GalleryCircus

Conflicts:
	newSingle/test.txt