Set git to ignore log files
Removed change bar left over from merge
Merge branch 'master' of https://github.com/nxidis/topekacb
Removed log file from commit set
Fixed conflict in git's ignore file
commit merge from heroku
Fixed overlapping of numbers with UW logo