update
update
update
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Updated site
Updated site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/comyarzaheri/personal-site

Conflicts:
	.DS_Store
merge
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site
Merge branch 'master' of https://github.com/comyarzaheri/personal-site