merge fix
more conflicts
Merge branch 'master' of https://github.com/ada10lgu/etsn05
merge
fixed merge