Added Font Awesome and X to remove subscriptions
Merge branch 'colin'
Pull from master and resolve merge conflicts.
Added /users index to routes and created a view
Merge branch 'colin'
Added Bookmarks link
Merge branch 'colin'