setup basic environment
added readme
fixing merge errors
Added bower.json to .gitignore