finishes authentication
adds logged_in? before_filter
sheeit
updates gitignore
fix conflicts
fix gitignore