kkkk
Merge branch 'master' of https://github.com/kinley/ads_3_2014