ChrisBoesch/akash — pull request #62 by architsharma241192 (2014-10-28 07:41:21+00:00)
Title: Removed merge errors

I have ensured all jshint tests are passing on Travis
Ensured no that there are no errors on the dev environement