Updated to match ASP fields
Merge
Shit the merges
Fixed merges before pull
Another merge issue, should probably make gitignore...
Trying to merge