removed swp files, added initial authentication for company_name
merge changes

Merge branch 'master' of https://github.com/jassicacanidy/CallistoReinvented