structre cleanup
Merge branch 'master' of https://github.com/Failsafe/NSS-FrontEnd
Merge branch 'master' of https://github.com/Failsafe/NSS-FrontEnd

Conflicts:
	2013-09-13-The-News/css/style.css
updated .gitignore
sass template