Commit
commit
Merge branch 'master' of https://github.com/kr0y/PoolPay

Conflicts:
	src/com/angelhack/sksp/poolpay/DynamoDBController.java