final changes for push
Merge pull request #53 from LAFcaptstone/steves

final changes for push