Added some features, haven't looked into fixing any old bugs, also haven't tested this but it's due in an hour
Merge branch 'new'
Merge branch 'master' of github.com:michaelbren/FitFinder