ds_store have to commit to update
committing again so i can pull
Merge branch 'audio2' of https://github.com/kadowki/falldown
this is nothing
another change
asset.js and game.js conflict
Merge branch 'ios' of https://github.com/kadowki/falldown
added a few lines
Merge branch 'ios2' of https://github.com/kadowki/falldown
changed config file
changed splash screen time