First Commit, remember to delete the CI and or JS reference material in second commit
Trying to resolve conflicts
Merge branch 'master' of https://github.com/ehack/ecirava

Because I'm trying to push my first repo