initial
login as main page
aslkdjfaskdjlf
Revert "aslkdjfaskdjlf"

This reverts commit 623d2ff3249e78f7d7db3ff79aaf25153c8cd1b6.
removed tomcat shit
login page
example add feed
subscription list
Created settings page and added link to the index
Added link to create account page from login screen
Merge branch 'master' of https://bitbucket.org/atscott/text-news-service

Conflicts:
	app/js/app.js
added navbar collapse
Merge branch 'master' of https://bitbucket.org/atscott/text-news-service

Conflicts:
	app/index.html
navbar
Merge branch 'master' of https://bitbucket.org/atscott/text-news-service
offset on large screens
using currentUser to manage subscriptions
styled some stuff on manage subscriptions
added filter for table
Merge branch 'master' of https://bitbucket.org/atscott/text-news-service