Merge branch 'machine'
Merge branch 'machine'
Merge pull request #26 from jjallen37/admin

Admin