initial commit
Merge http://github.com/Affliction123/shineyServer-kamata