Unstage
Unstaged
Merge branch 'master' of https://github.com/philleonard/Quick-Wifi

Conflicts:
	.idea/workspace.xml
Test
New commit
Trying again