Project plan

(hoppas inte jag förstör något)
Merge branch 'master' of https://github.com/wisingd/Dajoroli

Conflicts:
	Workspace/.metadata/.log
	Workspace/.metadata/.plugins/org.eclipse.cdt.core/.log

Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/SplitI
t/.indexes/e4/81/96/3b/history.index

Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/SplitI
t/.indexes/properties.index

Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/SplitI
t/.markers

Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/SplitI
t/org.eclipse.jdt.core/state.dat

Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcom
pat_v7/org.eclipse.jdt.core/state.dat
	Workspace/.metadata/.plugins/org.eclipse.core.resources/.root/21.tree

Workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	Workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Workspace/.metadata/.plugins/org.eclipse.jdt.core/1098081323.index

Workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	Workspace/SplitIt/bin/SplitIt.apk
	Workspace/SplitIt/bin/classes.dex
	Workspace/SplitIt/bin/resources.ap_
	Workspace/appcompat_v7/bin/appcompat_v7.jar