rename function
delete old file
Merge branch 'master' of github.com:asdffdsa123/SA-Project