Merge pull request #12 from Coms362/master

pulling in last of ryan's stuff
alsdkjf;as
Merge pull request #44 from Hartman2/master

final stuff