unnecessary change on AndroidManifest
Merge branch 'master' of github.com:agchang/syncup

Andy's update# the commit.
Merge branch 'master' of github.com:agchang/syncup

"merge conflict"
Merge branch 'master' of github.com:agchang/syncup

"merge conflict"
Merge branch 'master' of github.com:agchang/syncup

merge conflict
Merge branch 'master' of github.com:agchang/syncup

merge
res/values/strings.xml
Merge branch 'master' of github.com:agchang/syncup

merge
local change
local merge
solving conflict
Merge branch 'master' of github.com:agchang/syncup

merge
change background color