bundled assets for heroku
merge it with master
solved merge conflicts
Merge branch 'master' of https://github.com/tjalil/earthy
Merge branch 'master' of https://github.com/tjalil/earthy
Merge branch 'master' of https://github.com/tjalil/earthy into domisbranch
Merge branch 'master' of https://github.com/tjalil/earthy
added scoring statement
Merge branch 'master' of https://github.com/tjalil/earthy into domisbranch
Merge branch 'master' of https://github.com/tjalil/earthy
Merge branch 'domisbranch'