removing node_modules and bower_components and .idea
merging
merge
template content
Merge pull request #3 from cmlorenz/master

removing .idea files and adding content to home template