Revert "Merge branch 'master' of https://github.com/raymondgh/expendables"

This reverts commit 3244ced9f0faac9f5a3ab45fab72e3f06386b79a, reversing
changes made to 29ea5981916df01cb2ddfc4c25232621afd12a91.
Revert "Revert "Merge branch 'master' of https://github.com/raymondgh/expendables""

This reverts commit 5f8652cd4fcecf364ad1eb6c864d7121abed4c8e.
Revert "Revert "Revert "Merge branch 'master' of https://github.com/raymondgh/expendables"""

This reverts commit fe51aca827099ac8234952e61fae0acbf2b933b7.
Merge branch 'master' of https://github.com/raymondgh/expendables

Conflicts:
	expense-tracker/www/index.html