Added layout stuff
Merge branch 'master' of https://github.com/rjmccluskey/lil_twitter into xu

Conflicts:
	Gemfile.lock
	public/css/application.css
d
Merge branch 'master' of https://github.com/rjmccluskey/lil_twitter into xu
more layout work
Merge pull request #3 from rjmccluskey/xu

Xu