stylecop
Merge branch 'developing' of http://github.com/calmajos/CSE136-Project into developing