Initial commit
adding ignore and bower config
updating gitignore
result of merge