Merge branch 'master' into friends
Merge branch 'friends' of https://github.com/kdylan/money_tracker
Merge branch 'master' of https://github.com/kdylan/money_tracker
generic help