fixing up a conflict
Merge branch 'master' of github.com:seadsystem/App