Merge branch 'master' of https://github.com/chorta/ucsd-decorator
added background white change to make it look less like an actionable button
Merge branch 'input-group-addon'
Merge branch 'master' of https://github.com/chorta/ucsd-decorator
modified .gitignore file to exclude .idea/ files
added more details to .gitignore
removed tdr_wrapper
added layout.scss and modules.scss with comments on potential components
added the files
Merge branch 'master' of https://github.com/jdkschang/ucsd-decorator into dev
Merge branch 'dev' of https://github.com/jdkschang/ucsd-decorator into folder-layout

Conflicts:
	.gitignore