Merge branch 'entry'
misc
Merge branch 'master' of https://github.com/upperwal/CreditTracker