going to sync with kevins stuff
Merge branch 'master' of https://github.com/UpstreamApp/Upstream
syncing with james
connected with jamess stuff