added ERC as author
Merge remote branch 'upstream/master' into fpcal
Merge remote branch 'upstream/master' into fpcal
Merge branch 'testfirst' of https://github.com/crawfordsm/pysalt into fpcal
Merge branch 'master' of https://github.com/saltastro/pysalt into fpcal
Merge branch 'autospec' of https://github.com/crawfordsm/pysalt into fpcal
Merge branch 'master' of https://github.com/saltastro/pysalt into fpcal
Merge branch 'master' of https://github.com/saltastro/pysalt into fpcal
Merge branch 'master' of https://github.com/saltastro/pysalt into fpcal
Merge branch 'master' of https://github.com/saltastro/pysalt into fpcal
Adding Fp Widgets
Merge pull request #21 from EncarniRomeroColmenero/fpcal

added ERC as author