initial
Merge branch 'master' of github.com:titannano/SocialOn

Conflicts:
	LICENSE