making some sweet changes
Merge branch 'master' of https://github.com/alanga48/amy