Minor changes re-add marmalade
Make project search for C file more intuitive
Minor changes
Add melpa-stable to package archives
Merge branch 'master' of https://github.com/iqbalansari/dotEmacs

Conflicts:
	my-init.org