breaking stuff
updated gitignore
removed bower
fixed conflicted package file