Fixing merge
Merge branch 'develop' of https://github.com/zsweedyk/CS121F14S4_Team5 into develop
Fixing Merges
Merge branch 'develop' of https://github.com/zsweedyk/CS121F14S4_Team5 into develop
g Lines starting with '#' will be ignored, and an empty message aborts