added flexboxes and assemblymodel
Merge branch 'master' of https://github.com/austinneely/tripping-octo-dangerzone