Update, Testing Stage
Merge branch 'master' of http://github.com/Rmarmorstein/RAM