bug on button in log in and register activity
added android name on android manifest
resolved conflict with master branch
Merge branch 'master' of https://github.com/coldstar96/cse403
temporary fix for 'Create new budget...' causing problems. will be fixed properly once add budget activity is up
merged with master and resolved conflicts
resolved all conflicts with remote and local repository
resolved going next line bug on the amount in add entry activity
polished add entry page appearance
no change
Merge branch 'master' of https://github.com/coldstar96/cse403 into addEntry

Conflicts:
	src/com/example/budgetmanager/LoginActivity.java
	src/com/example/budgetmanager/RegisterActivity.java
Merge branch 'addEntry'