Fixed syntax
Merge branch 'master' of https://github.com/cwallac/SoftDesFinalProject
WHY IS THIS A MERGE ERROR
FIXED CONFLCIT
Index from zero
Merge branch 'master' of https://github.com/cwallac/SoftDesFinalProject