not sure what's here..
Merge branch 'master' of https://github.com/FabianSiddiqi/.emacs.d

Conflicts:
	init.el
	kbd.el
Updated shortcuts
added bookmarks
Resolved merge conflicts