-merging changes with remote repo
Merge pull request #40 from johnstoecker/core

Merging local changes with Raxa repo
pull the update and merged Diego's changes
pull the updates and merged Diego's changes
trash
Revert "trash"

This reverts commit a06f39ce5bcb0d82f5bb84c7d792f073231085b5.
Revert "pull the updates and merged Diego's changes"

This reverts commit cbee1b02038e9ea886e57bad929cb094c7fd2ae7.
Revert "Merge pull request #40 from johnstoecker/core"

This reverts commit b82db94f6cf18b61ab7c52e1ade492f329d2381d, reversing
changes made to 49917730841fa4138dee7b18bd39a72f2e516817.