working on layout diagrams for design specifications
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
cleaning up directory, working on photoshop layouts