Merge pull request #45 from Zhang/develop

Develop
reorganized
Merge pull request #49 from kang/master

bug fixes, css fix
Merge pull request #50 from kang/master

removed old css file
this fixes git ignore
changes git ignore
reorders for git ignore
refactored
Merge pull request #1 from Zhang/test

Test
Merge pull request #51 from Zhang/develop

Develop
bower.json and pckg.json
merged with develop
Merge pull request #52 from Zhang/master

merges refactor
merged in