File added
Merge branch 'master' of https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git
File added again, where the hell has it been lost?
Merge branch 'master' of https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git
Merge branch 'master' of https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git
Merge branch 'master' of
https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git

Conflicts:
	ch.bfh.bti7081.s2013.white/doc/cs01/task04/use-cases.md
Content
Merge branch 'master' of https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git
****
Merge branch 'master' of https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git
***k