asdf
Merge branch 'master' of https://github.com/dgolman/VTinder

Conflicts:
	favico
	img/favicon.ico
	index.html
	js/buybar.jquery.js
	js/model.js
	js/parse.js
	transactions.php
Merge branch 'master' of https://github.com/dgolman/VTinder

Conflicts:
	js/model.js