Merge branch 'darkleach' of C:\Users\Kyle\Documents\GitHub\timekeeperremake with conflicts.
9/23/14 - Calender with Problems
Merge remote-tracking branch 'origin/darkleach' into darkleach