Initial commit
Comit
Comit
Comit
Merge branch 'master' of https://github.com/vincedgy/myApp

Conflicts:
	.idea/inspectionProfiles/Project_Default.xml
	.idea/myApp.iml
	.idea/vcs.xml
	.idea/watcherTasks.xml
	.idea/webResources.xml