done
orgfixed
Merge branch '0.5' of https://github.com/morpheyesh/megam_api into morpheyesh-0.5

Conflicts:
	lib/megam/api/version.rb
Merge branch 'morpheyesh-0.5' into 0.5