meir rydding

Signed-off-by: Dag Henning Kalvøy <daghenningk@me.com>
Merge branch 'v2' of https://github.com/hsundt/groven into v2
Småting justert

Signed-off-by: Dag Henning Kalvøy <daghenningk@me.com>
Merge branch 'v2' of https://github.com/hsundt/groven into v2

Signed-off-by: Dag Henning Kalvøy <daghenningk@me.com>

Conflicts:
	henrik/.DS_Store