Changed email address, push default
Disabling trustctime in gitconfig
Added .aliases
Merge branch 'master' of /Users/sven/Dropbox/Projects/config

Conflicts:
	.gitconfig