Priprava admin strani.
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	data.db
	newstracker/urls.py
Merge pull request #10 from sevenmore/master

Added rss app, models and admin edit
update
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	data.db
remove DB
Merge pull request #11 from sevenmore/master

Fixed urls.py to include app specific urls.
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	newstracker/urls.py
update
Merge pull request #12 from sevenmore/master

AngularJS
Merge branch 'master' of https://github.com/ipri2013/newstracker
Edint tempplate login, register.html, account.html
navigation bar
Merge pull request #14 from sevenmore/master

Fixed gitignore ignoring lib folder
Merge pull request #13 from pljernej/Bootstrap

Bootstrap
Merge pull request #2 from ipri2013/master

Updating.