merge
merged .gitignore and removed sublime files
Merge branch 'master' of https://github.com/BartGarbella/admingui

Conflicts:
	admingui.sublime-project
changed css path for bootstrap
Merge pull request #2 from chruffer/master

changed css path for bootstrap