.
,
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'dev' of github.com:project-fifo/jingles into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev

Conflicts:
	README.md
Merge branch 'test' into dev
Merge branch 'test' into dev
fore output inside some dd-tags to let the layout not break awful

layout of nics was getting clumsy if gateway was empty