no additional changes, just had one line of blank space deleted
Merge branch 'master' of https://github.com/riceonmars/summer2013
added 3 functions: ADO, EMA and ADL
Merge branch 'master' of https://github.com/riceonmars/summer2013