Merge pull request #25 from paulhyunkim/tsangbranch

Resolved conflicts
trying to fix update method through angular crud
sign-up form
minor changes
Merge branch 'master' into stylebranch
changes in controllers
Merge pull request #26 from paulhyunkim/stylebranch

Stylebranch
More resolved conflicts