created CiController.cs
Merge branch 'master' of https://github.com/gablorquet/amf

Conflicts: