Added the ability to display link-based ads
Fixing merge conflicts

Conflicts:
	js/app.js