starting past work here
nice outline nice
nice 2
nice outline 3
ok
Merge branches 'master' and 'pastwork'