File-Looc

Change-Id: I5fbc96c83383ddbff755e7be2453b36ee20bb447
Signed-off-by: Nicolas <studium@nmarin.de>
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git

Conflicts:
	data/stats.txt

Change-Id: Ib569116f21c4f02ba6ac31e649d51033e79f9a47
Signed-off-by: Nicolas <studium@nmarin.de>
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git