Merge pull request #4 from bobbyjoemoma/master

master pull
Merge pull request #6 from bobbyjoemoma/master

pull from master
Merge pull request #8 from bobbyjoemoma/master

pull master
Mhm
Merge pull request #9 from bobbyjoemoma/branch_layout

Branch layout