Merge pull request #26 from mancabizjak/login

Added basic view for logging in and some base angular code.
Merge pull request #27 from mancabizjak/registration

Added view and base front-end logic for registration
Merge pull request #28 from mancabizjak/outside_resources

Uploaded base code for google+ and disqus
Merge branch 'outside_resources' of github.com:mancabizjak/YournalProject into mancabizjak-outside_resources
removed log file
Merge branch 'mancabizjak-outside_resources'
added fb/twitter/google+ share buttons
Merge pull request #30 from jani-bevk/like-buttons

ok
Merge remote-tracking branch 'upstream/master' into outside_resources

Conflicts:
	src/client/controllers/article.coffee
Merge pull request #31 from mancabizjak/outside_resources

Updated disqus commenting