Learned the git rm --cached command - hopefully will solve the problem of the log file constantly being pushed
fix merge conflicts
delete log files
Added log/**/* to gitignore
Merge branch 'git_ignore_branch_alisa' of https://github.com/tiger-swallowtails-2014/JobThing into git_ignore_branch_alisa
Merge pull request #7 from tiger-swallowtails-2014/git_ignore_branch_alisa

Learned the git rm --cached command - hopefully will solve the problem o...