Initial commit
small template fixes
renamed template
modified user in bower.json
fixed conflicts with remote