CommitSameTime
Commit
Merge branch 'master' of https://github.com/christor54/Workspace_Marc_Chris

Conflicts:
	DareIt/src/com/example/dareit/MainActivity.java