Just commit
Commit
Merge branch 'master' of https://github.com/gerardino/spacecoatl

Conflicts:
	.idea/modules.xml
	app/src/main/AndroidManifest.xml
	spacecoatl.iml
Adding Fragments to Main Spacecoatl
Merge branch 'master' of https://github.com/gerardino/spacecoatl

Conflicts:
	app/src/main/java/com/example/spacecoatl/app/Dashboard.java