Initial commit
Merge branch 'sample' of https://github.com/acsoliman/ac
aubrey
fixed conflicts