Initial commit
Initial version of starter code
Test file for branch
making my branch
Added Design Document
Added Design Document
updated design doc
updated design document
updated design doc with Spring Class
Added a simulation package for java files. Added XML parser and mass class.
Merge pull request #1 from duke-compsci308-spring2014/benson

Benson
Added simulation package with XMLparser
Merge branch 'master' of https://github.com/duke-compsci308-spring2014/springies_team01
Merge branch 'benson' of https://github.com/duke-compsci308-spring2014/springies_team01

Conflicts:
	src/Main.java
Added FixedMass and Mass
Merge branch 'master' of https://github.com/duke-compsci308-spring2014/springies_team01 into benson

Conflicts:
	src/simulation/Mass.java
Updated Mass/FixedMass. Need to Integrate Parser
Merge https://github.com/duke-compsci308-spring2014/springies_team01 into inyoung
Added git instructions
Merge branch 'master' of https://github.com/duke-compsci308-spring2014/springies_team01 into benson