Models was extended
Templates was added
Urls was added
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/main/main.html