first script
Merge branch 'master' of https://github.com/fall14/540