Changes to be committed:
	new file:   ../.gitignore
        modified:   ../README.md
	modified:   ../docs/protokoll_2014-11-07.tex
	new file:   Makefile
	new file:   config.c
	new file:   config.h
	new file:   main.c
	new file:   performConnection.c
	new file:   performConnection.h
	new file:   utils.c
	new file:   utils.h
Add Readme.txt
Merge branch 'master' of https://github.com/PPP12345/Schwulenverein-SanFrancisco-Gruppe23
Merge pull request #1 from DominikBitzer/master

Meilensteinplanung
Merge branch 'master' of https://github.com/PPP12345/Schwulenverein-SanFrancisco-Gruppe23
Delete Readme.txt
Delete README.md
PDF aus tex erstellt da nicht Standardpackages benutzt. Bitte immer zur tex auch PDF hochladen.
Tex to pdf Merge
Create README.md
Upload der Anforderungen
Merge remote-tracking branch 'DominikBitzer/master'

 Changes to be committed:
	new file:   docs/Gruppe23 Abgabe der Meilensteinplanung.ods
	modified:   .gitignore
	modified:   README.md
Merge remote-tracking branch 'PPP12345/master'

Conflicts:
	README.md

	new file:   docs/MS_00.pdf
	new file:   docs/MS_01.pdf
	new file:   docs/MS_02.pdf
	new file:   docs/MS_03.pdf
	new file:   docs/MS_04.pdf
	new file:   docs/protokoll_2014-11-07.pdf
Date
 Changes to be committed:
	modified:   docs/protokoll_2014-11-07.pdf
Merge pull request #3 from ciil/master

Teile MS 1
Vorjahresprojekte hinzugefuegt
Meilensteinplanung formattiert und in pdf konvertiert