Changes made by Kelly Seale (kellydseale@msn.com).
Merge branch 'master' of https://github.com/jordnlvr/github_MCS4.git
Merge branch 'master' of https://github.com/jordnlvr/github_MCS4.git

Conflicts:
	MCS4/.abproject