Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop
added my email to travis notifications
added static page for instructor specific content
Merge branch 'develop' of https://github.com/AgileVentures/codealia into pages
made changes in instructors.html to fit into the page template
cleaning up the code
created two_columns layout, set as default layout in static_pages controller
footer issues....
changes in footer
updated  the codealia css clatt to be hidden on tablets and phones
Merge pull request #19 from tochman/pages

Thanks Thomas
Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop

Conflicts:
	.travis.yml