working on app UI
Merge branch 'master' of https://github.com/anderdev/portfolio.git

Conflicts:
	cashTrack/WebContent/scripts/app.js