adding final elephant
Merge branch 'master' of github.com:jacthoma/Project-Elephant into elephant