Committing final changes
Merge branch 'master' of github.com:rdnelson/Proxima