On home Desktop Ubuntu box, hopefully I can get everything on track with new repository form school
Merge branch 'master' of https://github.com/UCCS-CS3300-Spring2014/mlockett

Conflicts:
	hw2/public/lib/oracle_of_bacon.rb~
	testy.rb~
Merge branch 'master' of https://github.com/UCCS-CS3300-Spring2014/mlockett
Saturday night after completion of part 3!!! pushing up