Added bower.json
merged master
Added landing page html
Merge branch 'landing-page'