Edited conceptual diagram
Merge branch 'master' of https://github.com/kuyutha/Senior-Design

Conflicts:
	SRS/AegleSRS-Peer Review.docx