Gustavo Cortez 7d52f8487b Merge branch 'master' into feature/socket-io-support ... Fixed conflicts on: index.html js/app.js		2014-04-17 00:43:50 -03:00
..
socket.js	Socket-io integration. Using a local socket.io.js file.	2014-04-17 00:36:08 -03:00
walletFactory.js	new WalletFactory	2014-04-16 17:51:42 -03:00