merged local to remote
merged
Merge https://github.com/rnecesito/arkondigital

Conflicts:
	client/css/main.css
	client/templates/partnership.html
	packages/.gitignore