Fixed
Merge branch 'master' of https://github.com/iShoutOut/iShoutout_V5

Conflicts:
	_notes/dwsync.xml
	assets/.DS_Store