Filename of "MenuActivity" #14
Merge branch 'master' of github.com:t0n3/touch-irc

merge is necessary,
Merge branch 'master' to local...
Fragments, minor modif in server model, new activity #4
Add some colors :) #4
Merge branch 'master' (conflict with local branch resolved)
Merge branch 'master' (local conflict :) )