Merge pull request #4 from theolesband/master

merge nicklmarks local with theolesband master on godaddy
Merge pull request #6 from nicklmarks/master

Merge pull request #4 from theolesband/master