.........
Merge
Merge branch 'master' of https://github.com/ehurem/SI2013Tim5

Conflicts:
	POC/POC1/bin/.gitignore