recording absences
merging
Merge https://github.com/HamidM250/S-Ware into matt1

Conflicts:
	Gemfile.lock
	db/seeds.rb
	log/development.log
Merge pull request #1 from Matt--/matt1

Matt1 - yes please
git is painfull
rspec tests
resolved numerous failing tests
merged
merge 2
merge 3
merge 4
Merge https://github.com/HamidM250/S-Ware into HEAD
merge 5?
Merge https://github.com/HamidM250/S-Ware into HEAD
fixed merging bugs
merge
added back code deleted earlier
awesome, may hv figured out how to fix my git stuff up