Modifying .gitignore -Dhagen
Dealing with issues from pull. -jmcdaniel
Deleted log file from repo that shouldn't be there. -jmcdaniel
Merge branch 'dev-master'