adding calculations
Merge branch 'master' of https://github.com/agamarra88/pds

Conflicts:
	PSDHack/PSDHack.xcodeproj/project.pbxproj
adding farnm
adding calculations
commit
Merge remote-tracking branch 'origin/master'