initial import
added ignore file
merged master