Initial commit

Initial commit
Minor fix
Merge branch 'master' of https://github.com/cieslak/EPFWhereIsSanDiego