Map quick fix
Merge branch 'master' of https://github.com/CS370-soft-eng-practicum/Postcard

Conflicts:
	application/views/pages/home.php
Merge branch 'master' of https://github.com/CS370-soft-eng-practicum/Postcard
Code documentation added
Code documentation added