First commit, boilerplate and polymer element
Fixed conflicts