Merge pull request #100 from challengeaneka/master

michael's edits, removed excel lock file, updated pdf
changes from Shane