playing w magellan
Merge branch 'dev' of https://github.com/MitchelCabuloy/Caritas into dev
finished services page hhuehue
merge with some stuff