Merge branch 'master' of github.com:CWI/mobile-stats
Changed iPhone version to iOS version, fixed little layout issues
Fixed javascript syntax error
Fixed javascript bug for windows phone
Merge pull request #39 from rgarbin/master

Travis-ci settings
Merge pull request #40 from dwayhs/master

Stuff
Merge branch 'master' of github.com:CWI/mobile-stats
bumping ruby version to 2.0
adding rspec, cucumber and jasmine tests.
fix git ignore.
remove old tests.
Update README.md
Update .travis.yml
Merge pull request #41 from rgarbin/master

Fisrt unit test
Update stat_data.yml
Update stat_data_test.rb
Update Gemfile
Update Gemfile
Update .travis.yml
Update .travis.yml