pulling new layout
Merge branch 'master' into luisr
new stuff
resloved conflicts
Merge pull request #3 from theklr/luisr

Luisr