updates
Merge branch 'master' of github.com:rwesson/paperII
Merge branch 'master' of github.com:rwesson/paperII
Merge branch 'master' of github.com:rwesson/paperII
Merge branch 'master' of github.com:rwesson/paperII
updates