First commit
Merge github.com:sdiemert/oscarmeds