hheheuhue
Merge branch 'dev' of https://github.com/MitchelCabuloy/Caritas into dev

Conflicts:
	Caritas/templates/home/services.html

hi
:wq
merge conflicts
fixed magellan border
Merge branch 'dev' of https://github.com/MitchelCabuloy/Caritas into dev