3
Merge branch 'master' of https://github.com/Astarcorp/tradingwithfriends

Conflicts:
	index.php