removed touch test styles
added some core styles
Merge pull request #37 from bradoyler/core-styles

added some core styles
each stream scrolls independently
updated timestamps
Merge branch 'master' into scroll-card-list

Conflicts:
	app/styles/app.scss
fix some login weirdness
updated the grid
Merge branch 'master' into scroll-card-list
fixed scroll-list. merge it dood.
gave the body some breathing room
Merge branch 'scroll-card-list' of https://github.com/bradoyler/gitflow into scroll-card-list
Merge pull request #38 from bradoyler/scroll-card-list

each stream scrolls independently
base styles for login
put a max-width on the the streams
Merge branch 'master' into gh-pages

# By Ian Rose (8) and Brad Oyler (2)
# Via Ian Rose
* master:
  put a max-width on the the streams
  base styles for login
  gave the body some breathing room
  fixed scroll-list. merge it dood.
  updated the grid
  fix some login weirdness
  updated timestamps
  each stream scrolls independently
  added some core styles
  removed touch test styles