Additional changes to alpha layout
Merge pull request #821 from sinfuljosh/master

Additional changes to alpha layout
Merge remote-tracking branch 'remotes/origin/master' into dev
Merge pull request #823 from sinfuljosh/dev

Merging alpha template