changes to who we are
Merge branch 'feature/bootsrap'