Merge branch 'master' into country_testing
Corrections mainly in descriptions
Add some more user tests
Add more testing and fix an error
Add more tests
Fix an error message
Fix some spelling mistakes
Fix spelling
Merge pull request #31 from VitSalis/user_test

Add some more user tests
Add test for authenticateswithpassword
Corrections
Add testInsertCountries()
Merge branch 'master' into country_testing
Add testFindNonExcistentCountry and remove country truncate exception
Delete testInsertCountries()
Corrections
===
Merge pull request #32 from VitSalis/user_test

Add test for authenticateswithpassword
Merge pull request #25 from pkakelas/country_testing

Country testing
Merge branch 'master' into ascii_salt