pic change
Merge branch 'master' of https://github.com/GrayAreaorg/Summer-Immersive-2014

Conflicts:
	img/ld.jpg