Portet to servcinf
Merge branch 'master' into new_fridays_work
Initial display code
Merge pull request #9 from JNRiedel/new_fridays_work

New fridays work