update test
test master111
Update README.rdoc
add key
Merge pull request #2 from robinhood205/feture/view3

update test
Update heroku.sh
Merge pull request #3 from robinhood205/fix_tuition

Fix tuition
Update .travis.yml

secure
Update .travis.yml
Update .travis.yml

secure update
delete conflict