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 develop
changes in travis.yml to get CD working
Merge branch 'fixes' of https://github.com/tochman/codealia into fixes
Made a few changes to travis.yml
Merge branch 'develop' of https://github.com/AgileVentures/codealia into pages
made changes in instructors.html to fit into the page template
Testing if deploy works
Deploy works now. REverted travis to correct api keys
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
Added Git Strategy
Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop

Conflicts:
	.travis.yml
Merge pull request #20 from sampritipanda/develop

Fixed Issues with Travis Continuous Deployment