final updates
Merge pull request #14 from msu-web-dev/final

final updates