added new views
added new views
fixed merge issue
Merge branch 'master' of github.com:austinlin/fintechhack