get tips
integration part 0.1
Merge branch 'master' of github.com:TamaraAtanasoska/ClubCloud

Conflicts:
	myproject/urls.py
	myproject/views.py