-> Modified ICD xml to match the wiki pages on the Github site
-> Started work on a local virtual arena for debugging
-> Started incorparating Bluecove for bluetooth communication
Merge branch 'master' of https://github.com/carlospamg/Tangible-Programming
Merge https://github.com/carlospamg/Tangible-Programming

Conflicts:
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/57/b0e2816a48c100131d7fd3e5532a9104
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/b5/60e73f8dedc200131100beca641e7890
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/ba/1049bb7948c100131d7fd3e5532a9104
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/d7/d0c0706948c100131d7fd3e5532a9104
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/f7/f0b9f4c747c100131d7fd3e5532a9104
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/.indexes/e4/b0/history.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/.indexes/history.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/org.eclipse.jdt.core/state.dat
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/4/15/refactorings.history
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/4/15/refactorings.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/TestingApplication/2014/4/15/refactorings.history
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/TestingApplication/2014/4/15/refactorings.index
Merge branch 'master' of https://github.com/carlospamg/Tangible-Programming

Conflicts:
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/b0fd43542bc70013125da95ec255cc4a
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/.indexes/e4/b0/history.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/.indexes/history.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.ui.prefs
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.jdt.core/3135722250.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.jdt.core/3319543304.index
Merge branch 'master' of https://github.com/carlospamg/Tangible-Programming
Merge branch 'master' of https://github.com/carlospamg/Tangible-Programming
Merge branch 'master' of https://github.com/carlospamg/Tangible-Programming
Merge branch 'master' of https://github.com/carlospamg/Tangible-Programming

Conflicts:
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/53/509da7012bc70013125da95ec255cc4a
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.history/63/7020a03b14c70013125da95ec255cc4a
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/.indexes/e4/b0/history.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestingApplication/.indexes/history.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.ui.prefs
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.jdt.core/3135722250.index
	prototypes/JavaWorkspace/.metadata/.plugins/org.eclipse.jdt.core/3319543304.index
	prototypes/JavaWorkspace/TestingApplication/sampleNestedLoops.tang
-> Fixed String issue in TopCodesController
-> Added TangableCompiler.jar to Repo