Minor css changes
Merge branch 'master' of https://github.com/Cheerazar/twitter_jr_week_2

Conflicts:
	app/views/index.erb
	public/css/application.css
Merge branch 'master' of https://github.com/Cheerazar/twitter_jr_week_2

Conflicts:
	app/views/index.erb
Remove extra material from merge issue.
Merge pull request #18 from Cheerazar/merging_issues

Merging issues