Merge pull request #24 from dhfromkorea/dev

resolved all merge conflicts. use this
pull request
pushing up merged changes
Merge pull request #25 from Yahkob/dev

merge dev / master
Merge pull request #26 from dhfromkorea/dev

added /account route
resolved merge conflicts
resolved merge conflicts