Merge

Description: Made it work, updated gitIgnore.

Commit by: Thomas