syn
what is this
done
Merge branch 'master' of https://github.com/Jacky311/BlackBerryApp-Budget

Conflicts:
	js/db.js