Removed Cargo.lock from lib
Merge remote-tracking branch 'upstream/master'
Updated to latest rustc and incremented version
Fixed merge by removing lock file
Merge pull request #5 from mitchmindtree/master

Updated to latest rustc