Merge pull request #5 from atteroTheGreatest/rest_api

Rest api
add views and landing page
Merge branch 'master' of https://github.com/atteroTheGreatest/tubylcy into landing_page

Conflicts:
	tubylcy/locations/views.py
	tubylcy/tubylcy/urls.py
Merge pull request #6 from atteroTheGreatest/landing_page

Landing page
Merge branch 'master' of github.com:atteroTheGreatest/tubylcy into rest_api

Conflicts:
	tubylcy/locations/views.py