committing for merge
Merge branch 'master' into links
webfont noticia text
link styling
navbar font and link styling
styling changes to navbar and body, font and link color
Merge branch 'master' into links
changed code_snippet_params to image_params in image controller
fixed iamge view so it doesn't explode with blank upload, added specs
specs for image uploader not uploading non image
Merge pull request #60 from nealcpeters/tutorial_page

Tutorial page
init for edit specs, nothing done time to merge
raise min size for image
navigation icons on home page and css positioning
fixed merge conflict, AJAX and error catching for bad input to image playing nicely now
Merge pull request #61 from nealcpeters/eric_spec_dev

Eric spec dev
changed some id to classes in sub-cchapters partial
Merge branch 'master' of https://github.com/nealcpeters/infobytes into tutorial_show
Merge branch 'master' of https://github.com/nealcpeters/infobytes into tutorial_page
three column layout on homepage