.gitignore added
Fixed localhost hacks in layout
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from cblgh/master

un poquito fix, dehacked view-locations