adding commits from master
removed file from repository
Merge pull request #2 from crawfordsm/placeholder

updates after build