Merge branches 'master', 'master', 'master' and 'master' of github.com:massiccio/java
Merge branches 'master', 'master', 'master', 'master' and 'master' of github.com:massiccio/java
adding code for Erlang A
Merge branches 'master', 'master', 'master', 'master', 'master' and 'master' of github.com:massiccio/java