add daimar
Merge branch 'master' into daimar
hey
Merge branch 'master' into daimar

Conflicts:
	shared
Merge remote-tracking branch 'origin/master' into daimar

Conflicts:
	shared
Merge pull request #5 from white-chocolate/daimar

Daimar