added
added Nov 9
Merge branch 'master' of github.com:Milstein/MS-2014-Boise-State-University

Conflicts:
	Software Engineering/Assignments/Assignment3/Assignment3/bin/.gitignore
	Software Engineering/Assignments/Assignment3/HW3_MilsonMunakami.doc
added
added
added
added