Error -> 'Error' in view
Merge branch 'master' of github.com:Alvin-Vuong/triplexarchery
started implementing dashboard activity