Companies
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/jam/templates/swingtime/recurring_form_part.html
Comp page
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject
Edit company page works
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject