Ignore tags files generated by haskellmode-vim
Merge branch 'master' of github.com:OmnipotentEntity/fluidsim

Conflicts:
	src/.gitignore
Added tags file