merge with no-ff
fix bug 101
merged bug fix 101
fix bug 101
merged bug fix 101
fix bug 101
merged bug fix 101
add .gitignore file
Merge branch 'master' into dev

Conflicts:
	readme.txt