javascripts location fixed in proposed budget.html
removed dropbox conflicted files