Setup Logan's environment
Merge branch 'master' of github.com:BudgetApp/BudgetApp

Conflicts:
	.gitignore