dfsklfldsj
Merge github.com:Sivitas/njOnTime
"MERGE"
Merge github.com:Sivitas/njOnTime
"merge"
did some server stuff
added server
moved shit around