fixed typo in package.json
reset bower.json
fixing the header issue
fixed cors header
fixed typo in package.json
reset bower.json
fixing the header issue
fixed cors header
cleaned up unused code
resolved merge conflict
Merge pull request #18 from dhfromkorea/master

resolved merge conflict and cleaned up the code