capu/SYCS100 — pull request #184 by tems4real (2013-11-22 22:58:48+00:00)
Title: Oreoluwa Onatemowo's code

Please if there is a conflict, can you tell me where the conflict is? I can't seem to find any. Thank you