Add ssl to .gitignore
Fix merge conflict

Merge branch 'master' of https://github.com/dkoslow/webrtc_video

Conflicts:
	.gitignore
Update server to https.
Merge in server update to https

Merge branch 'ssl'