Working on stuff...I honestly forgot...fell asleep
Merge branch 'master' of https://github.com/carolynnvu/spendtrack-ios
merge
Merge branch 'master' of https://github.com/carolynnvu/spendtrack-ios