There is a new permit_merge_data_perport.csv file, with columns for perport and year, in the DropBox.  I moved all the perport code out of frame.R and into the perport.R file.  perport.R is a little bit messy still; I will clean it up soon.  I'm still not sure if frame.R is the right approach, so we can change it as needed.
No changes.

Merge branch 'master' of https://github.com/kaycole/fish_shift

Conflicts:
	Code/perport.R
Merge branch 'master' of https://github.com/kaycole/fish_shift
Removed testing code and commented out export code.
Minor changes.
Merge branch 'master' of https://github.com/kaycole/fish_shift
assign.geargroups function assigns a geargroup to each row of data in tripdata.