Added Landing Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/services.js
Resolved Merge Conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/services.js