began work on account dashboard
More work on user dashboard for authenticated users
Merge branch 'master' into slide-transitions
Working with auth to allow user specific account pages
accidentally edited master, attempting to prevent merge conflicts
Merge branch 'master' of https://github.com/KyleW/presentaur
Merge branch 'master' into slide-transitions
ready to merge with new and improved master branch
Merge branch 'master' of https://github.com/KyleW/presentaur
Merge branch 'master' into slide-transitions

Conflicts:
	server/auth.js
angular-cookies installed and user_id being saved to cookies on login
Merge branch 'master' of https://github.com/KyleW/presentaur
Merge branch 'master' into slide-transitions
ready to merge with master for user specific cookie handling
Merge branch 'master' of https://github.com/KyleW/presentaur
Merge branch 'master' into slide-transitions
Cookies now persistantly storing userid
Merge pull request #51 from KyleW/slide-transitions

Cookies storing user IDs for persistent login