added current user helper
resolved conflicts
added a big button to the index page
added signout link