add scaffold Lan and modify ipams-tables20141020a.xls
add scaffold Lan
Ignore *.swp files in .gitignore
Merge branch 'develop'