Added Friendly URL
Merged our conflicts
Added friendly and meta tags
Merge branch 'dev' of github.com:Ajhandler/Local into friendly
Merge pull request #53 from Ajhandler/friendly

Friendly