Fixed test cases, slight changes to other code
Merge branch 'branch1' of https://github.com/hardbot/americano into branch1

Conflicts:
	main.cc