work on front end
landing page works
adding forgotten files
soon to work. Waiting for charles to end his PR to merge
Merge pull request #1 from habfast/register

Register
Merge branch 'master' into front_end_work

Conflicts:
	otoreza/core/algo_reservation.py
	otoreza/core/api_calendar.py
	otoreza/core/models.py
	otoreza/core/views.py
	otoreza/urls.py
integration with api_calendar works
ready for PR
more minor improvements
Merge pull request #2 from habfast/front_end_work

Front end work
Merge branch 'master' into register

Conflicts:
	otoreza/core/models.py
	otoreza/core/views.py
	otoreza/urls.py