ChrisBoesch/akash — pull request #56 by architsharma241192 (2014-10-27 06:37:10+00:00)
Title: removed merge conflicts for internship partial, internship admin p…

Removed the merge conflicts