merge of interface
Merge branch 'master' of https://github.com/fantaboys/sportpal