commit to pull
commit cache to pull
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	budgetApp/.cache
	budgetApp/app/views/index.scala.html
	budgetApp/budgetdb.sql
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	budgetApp/app/models/Expense.java
	budgetApp/app/views/home.scala.html
Merge remote-tracking branch 'choose_remote_name/master'
commit to pull
commit to pull
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	budgetApp/app/Global.java
	budgetApp/app/models/Expense.java
	budgetApp/app/views/home.scala.html
	budgetApp/budgetdb.sql
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	budgetApp/app/Global.java
	budgetApp/app/models/Income.java
	budgetApp/app/views/home.scala.html
	budgetApp/app/views/index.scala.html
initial scheduling test passed
Scheduled incomes and expenses