edit challenge completed
Merge http://github.com/anil-ninja/teamroom
Merge http://github.com/anil-ninja/teamroom