removed my git ignore ready for Matts
Merge https://github.com/adamsardar/TraP
made the SQL statements readable by a human, also made sure that the uniprot id duplication in the id_mapping table wasn't an issue. luckily we are legends.
more scripts for making new formats
Fixed minor merge conflict. Git getting it's knickers in a twist over nothing
merging sardar
merge sardar with conflicts resolved
Merge branch 'master' of https://github.com/adamsardar/TraP
Merge branch 'master' of https://github.com/adamsardar/TraP
my changes for the last few days
merged changes in the epoch_percentage_composition.pl
pre merge v2
Workign on heatmaps
Merge https://github.com/OwenRackham/TraP
Incorporating Owen's work
Merge github.com:adamsardar/TraP