Updated with Buildings and Features slides (2)
Merge branch 'acfr47' of https://github.com/fs2014-cs3380/Unions

Conflicts:
	babbage/powerpoint/Group18 Presentation.pptx