unneccessary commit of .class file. Will move to gitignore asap
Merge branch 'master' of git@github.com:sbarton933/scrum.git

Conflicts:
	org.eclipse.emf.ecp.scrum.sprintplanner/bin/org/eclipse/emf/ecp/scrum/sprintplanner/action/ShowSprintPlanner.class
Merge branch 'master' of git@github.com:sbarton933/scrum.git