updated encrypted travis credentials
Merge pull request #17 from PeteBoucher/develop

Merging my own PR
updated UI on index. Moved some tags around in order to maintain the red bg in place
Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop
added my email to travis notifications
added static page for instructor specific content
1:st iteration of layout. Need to be revisited when we start to add functionality. Need to implement nested layouts probably
Merge branch 'develop' of https://github.com/tochman/codealia into develop
Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop
Merge pull request #18 from tochman/develop

OK, lets get the ball rolling on deploying this site. Thanks for your efforts Thomas
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
added codealia ide files from old spike
created two_columns layout, set as default layout in static_pages controller