changes
Merge branch 'feature/famcoin' of chaz.rackspace:/root/famcoin into feature/famcoin
add test thing
fix console thing