Merge pull request #1 from cmlorenz/master

modularizing the client
Revert "modularizing the client"
Merge pull request #2 from calebthebrewer/revert-1-master

Revert "modularizing the client" because it includes node_modules and bower_components
adding gitignore, hopefully its not too late
Merge remote-tracking branch 'origin/master'
merging