more changes in ll also
feature1 in upstream
additions to feature1
Merge pull request #1 from logiclocker/feature1

Feature1
more changes in upstream master
Merge branch 'master' of github.com:logiclocker/git-scratch
fixing feature1
changes to upstream maste
merging from upstream