flannel
cotton
polyester
merge resolution
Updated git deck to include summary slide of standard workflow
Merge branch 'master' of github.com:bayleefeore/rocketu-201401