layout changes
Merge branch 'master' into development
merged
gitignore
Merge pull request #1 from vadiraja/development

Development