Updated flex layout
Merge remote-tracking branch 'origin/master' into gh-pages
Hooked up reset by shake to VM
Moved window shake listener
na
Merge remote-tracking branch 'origin/master' into gh-pages
merge
Merge remote-tracking branch 'origin/master' into gh-pages
WIP