UI 2.0

Brand New Design of UI
Merge branch 'master' of https://github.com/strandx/csci3130

Conflicts:
package.json
UI 2.0

Brand New UI Design
Merge branch 'master' of https://github.com/strandx/csci3130

Conflicts:
	js/expense.js
	package.json