merge fix
merge fix
Merge branch 'development' of github.com:trivett/tangochan into development
Merge branch 'development' of github.com:trivett/tangochan into development
Merge branch 'development27' of github.com:trivett/tangochan into development
Merge branch 'development27' of github.com:trivett/tangochan into development
badge system added
Merge branch 'dev28' of github.com:trivett/tangochan into dev28