Kildekode for aktiviteter, etc
bin
cache
Clean
Merge branch 'master' of https://github.com/geirskoglund/trace

Conflicts:
	Trace/bin/Trace.apk
	Trace/bin/classes.dex
	Trace/bin/classes/.gitignore
	Trace/bin/dexedLibs/android-support-v4-8ec3d5dc9999e2191e093a2d539722ce.jar
	Trace/bin/resources.ap_
	Trace/gen/.gitignore
	Trace/res/layout/fragment_current_plan.xml
	Trace/res/layout/fragment_latest_plans.xml
	Trace/res/values/strings.xml
	Trace/src/no/hiof/trace/activity/MainActivity.java
	Trace/src/no/hiof/trace/fragment/AllPlansFragment.java
	Trace/src/no/hiof/trace/fragment/CurrentPlanFragment.java
	Trace/src/no/hiof/trace/fragment/LatestPlansFragment.java