Initial commit
Alteracoes do issue #7
Merge https://github.com/manaweb/TrocaKi into dev
Merge branch 'dev' of https://github.com/manaweb/TrocaKi into dev

Conflicts:
	css/main.css
	index.html