added Branch alternative-JS_Framework
test
presentation update
Minor changes in readme file for test
Merge branch 'master' of https://github.com/fh-koeln/wba1-2012 into alternativeJSFrameworks
einfach löschen
Namensänderung
einfach neu
Aktualisierung
anfang index
Inhalt aktualisiert
Inhalt erweitert
Added Presentation
Updated Presentation
Updated Content
Updated Content
Merge remote-tracking branch 'origin/master' into CSS-Frameworks

Conflicts:
	2012-12-06-git-basics/index.html
	2012-12-06-html-basics/index.html
	2012-12-06-html-basics/training/training1.txt
	2012-12-06-html-basics2/index.html
	2012-12-06-web-basics/index.html
	README.md
Updated Content
index1.html hinzugefügt
added ShowHideFunction-File for demonstrating functionality of JS and JQ