add www before ieee-scam.org
* added CNAME file to help git dns
removed CNAME
Merge branch 'gh-pages' of github.com:ieee-scam/ieee-scam-www into gh-pages
Merge branch 'gh-pages' into newdesign

Conflicts:
	2013/CFP/CFP.html
	2013/CFP/index.html
	2013/index.html
Made a new design for 2013, merged it back into gh-pages
added link to 2013
Merge branch 'gh-pages' of github.com:ieee-scam/ieee-scam-www into gh-pages
The titles now take into account the nesting
Added CNAME to make the new domain work
Fixed CNAME
According to the docs, www. in front of the domain should trigger automatic forwarding
Now 2012 also points to the github hosted pages
remove redundent files
Added instruction on how to run the website locally
Added .DS_Store to .gitignore to prevent future commits
Added favicon for scam
Added new pictures to the site
added cfps