ty changes

Initial Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/contacts.js