Merge pull request #1 from TimSmole/master

Init
Merge pull request #1 from TimSmole/master

Init
Init.
Merge branch 'master' of https://github.com/ipri2013/tld
Init moj projekt.
Article.
Merge pull request #1 from ipri2013/master

KoseninaPullReq
Create home.html
Create profile.html
Update article.html
Update models.py
Update views.py
Views, okrnjena verzija 01.
Views, okrnjena verzija 01.
Merge remote-tracking branch 'remotes/Kosenina/master'

Conflicts:
	main/templates/main/home.html
	main/templates/main/profile.html
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	database.db
	main/models.py
	main/templates/main/home.html
	main/templates/main/profile.html
	main/views.py
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	database.db
	main/models.py
	main/templates/main/home.html
	main/templates/main/profile.html
	main/views.py
Merge remote-tracking branch 'origin/master'
Zadnji commit za nalogo 2