initial commit
added bower components ands CNAME record
added bower components and CNAME record
fixed conflicts