added namespace to gitignore, to ensure i dont have to do this in the future
and yet another silly commit, well atleast i learned how rstudio deals with conflict handling

Merge branch 'master' of https://github.com/phonixor/microplate

Conflicts:
	.gitignore
changed undelying storage, things are much faster now
fixed novastar parsers
fixed merge
fixed updateMetaData - was updateColNames
fixed $ and $<-
fixed [] and[]<-
added NAMESPACE to git ignore... should still remove it... at git..