Merge pull request #2 from kreider1997/develop

Template and Gulp Livereload
Merge pull request #1 from jmanock/master

Merge pull request #2 from kreider1997/develop