Commiting on server branch
Merge pull request #6 from BlackRai/Server

Upload for other computer