Revert 1fb2bad..3898424

This rolls back to commit 1fb2bad74faf318963dc1388533e0c4abaa8ec33.
Revert "Revert 1fb2bad..3898424"

This reverts commit a59533ddb4b4f2a23f18bc1ec58b20278ab452ee.
Download source on 3/17/2014
Add HelloWorld
Add poop
Merge branch 'michael'

Conflicts:
	DegreeAudit/build/classes/degreeaudit/DegreeAudit.class
	DegreeAudit/nbproject/private/private.properties
	DegreeAudit/nbproject/private/private.xml
	DegreeAudit/src/degreeaudit/DegreeAudit.java
Merge branch 'master' of https://github.com/aedwardsxula/xucs_cpsc_2740

Conflicts:
	DegreeAudit/build/classes/degreeaudit/DegreeAudit.class
	DegreeAudit/nbproject/private/private.properties
	DegreeAudit/nbproject/private/private.xml
	DegreeAudit/src/degreeaudit/DegreeAudit.java
Commit nbproject stuff