Merge branch 'development' of https://github.com/jtkilleen/14F_CS374_Team4 into development
Addded files for specification
Fixed merge issues
merged