ok, added server code in the folder new folder
Merge branch 'master' of https://github.com/yawhide/forheroku

Conflicts:
	New folder
server_code