Merge branch 'module-inspiration'
Merge branch 'module-inspiration'
Add .css files to gitignore
Add .css files to gitignore
Merge branch 'master' of github.com:thomastuts/Frontier

Conflicts:
	.gitignore
Basic upload script