Resolving uncommitted changes
Merge branch 'master' of https://github.com/pemami4911/Osprey

merging into local master branch