initial comit
Merge branch 'master' of https://github.com/wrodiaz/ads17sep.git