bootstrap
Merge branch 'bootstrap' of github.com:petercunning/memapp into bootstrap