Merge pull request #22 from paulhyunkim/tsangbranch

Resolving issues
more styling
resolved conflicts in user index.html
Merge pull request #23 from paulhyunkim/stylebranch

Stylebranch
working on update function through angular crud and end of night
route modification
search box. index
Merge branch 'master' into stylebranch
Merge pull request #24 from paulhyunkim/stylebranch

Stylebranch
fix merge conflicts