something
some add
Merge branch 'master' of https://github.com/RaghavSalvanshi/hackathon2013

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/InteractiveVideo/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/InteractiveVideo/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap