Fixed narrowing error in random no generator. Fixed include paths
removing autogenerated makefiles
updated gitignore
incorporated upi prograss into our branch