Some git and Eclipse related cleanup/Users/brionemde/Documents/Eclipse/workspace/BLOA/project.properties
Fooling around
Merge branch 'master' of github.com:brione/Brion-Learns-OAuth

Conflicts:
	project.properties