new
Pics deleted

Deleted github-mac.png and github-windows.png
Merge branch 'gh-pages' into 2013-10-10-Sicherheit
Increase font size for code snippets
CSS Advanced hochgeladen

und ist präsentations-fertig
Create folder testing

Datum leider noch nicht bekannt
research-file

Dokument in dem wir Seiten sammeln die wichtig für unsere recherche sind
Update testing-pages.txt
Merge pull request #37 from fh-koeln/2013-10-24-CSS-Advanced

CSS Advanced hochgeladen
Remove test slides which are just copies of the template.
Add martin
No umlauts. kthxbye.
Use the new Hightlight.js color scheme
Merge branch 'gh-pages' of github.com:fh-koeln/wba1-2013 into gh-pages
added slides - web-basics
Merge branch 'gh-pages' into web-basics
Merge branch 'gh-pages' into web-basics

Conflicts:
	2013-10-24-web-basics/index.html
Merge pull request #38 from fh-koeln/web-basics

Web basics
added web-basics to presentations.json
fix syntax error