Commiting readme
Added info
Fixed typo
Fixing conflict
First commit
Merge branch 'master' of https://github.com/viswanathamsantosh/Firefox-OS-Boilerplate-App into gh-pages

^O