merging from upstream
Updated readme directions to run app and added credits/thanks