fixed user_config.py
changed .gitignore
changed .gitignore again
removed user_config.py so it will be ignored

... in the future.
added an example user_config.py.txt
Jim's commit with conflicts resolved
Merge pull request #42 from JimHokanson/master

Contours for Normalized Worm and other changes
Links to worm tracking software
Rename Worm Tracking Software to Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Update Worm Tracking Software.md
Made the package run again

Jim it sounds like your method is to select some lines and run them in
IPython (MATLAB style), whereas I like to run wormpy_example.py in
Spyder directly.  Perhaps we can chat about this.  Let me know if this
commit causes you problems.
Update Worm Tracking Software.md
Merge commit '9bb9700b0d562523d3528e135d05d1602de96dfc'

Conflicts:
	wormpy_example.py