Merge pull request #1 from bandpassdev/master

initial pull
Merge pull request #2 from bandpassdev/master

advertiser page
Update temp.html
Update temp.html
Add favicon
Add link to favicon
Merge remote-tracking branch 'noah/master'

Conflicts:
	temp.html
Merge pull request #1 from JayGaynor/master

catchup