Merge pull request #1 from matehackers/master

Let's update this mofo
add gemfile.lock to push into heroku
firefox OS app
firefox OS app
Merge branch 'master' of heroku.com:mateaberto
Merge branch 'master' of heroku.com:mateaberto
Merge branch 'master' of heroku.com:mateaberto
hummmm
fos logo
fos logo
Merge branch 'master' of heroku.com:mateaberto
right content-type
right content-type
Merge branch 'master' of heroku.com:mateaberto
Merge branch 'master' of heroku.com:mateaberto
Merge branch 'master' of heroku.com:mateaberto
fix manifest to firefoxOS
fix manifest to firefoxOS
merge
merge