adding package dependencies with bower
fixing merge conflicts; adding gitignore