Updated our .gitignore a bit
Merge branch 'master' of github.com:LitusProject/Litus
Minor change to fix a layout bug
Merge branch 'master' of github.com:LitusProject/Litus