rescue exception handling for channel creation on bad url
sanitize article url for %3. refactor &sa sanitation.
populate channel preferences on liking an article. change form action to match link in iframe.
WIP: add bootstrap. article carousel only rotates last article
Merge branch 'master' into article_carousel
fix typo in gem file
WIP: keyword set is a backgroun job, but configuration of pools never scrapes keywords for first three or four channels
simplify google scrape params
user authentication tweek and nav bar for sign in/ sign out
fixed merge conflict with users/show.html.erb
Merge pull request #8 from mule-deer-2013/simplify_google_scrape_params

simplify google scrape params
Merge branch 'master' into background_article_keywords
fixed merge conflict in channel.rb
Merge branch 'master' into article_carousel

Conflicts:
	Gemfile.lock
	app/views/channels/show.html.erb
fix master
remove foundation in stylesheets
fix styling for nav bar (margins)
Users#show action, find user by current_user rather than params. Fixes root_path bug.
remove redundant partial from user show
Merge branch 'sanitizing_coming_keywords' of https://github.com/mule-deer-2013/NewsShark into sanitizing_coming_keywords

Conflicts:
	db/schema.rb