first commit
Merge branch 'master' of https://github.com/dankarlin/redmine-2.3

Conflicts:
	.gitignore

fixing .gitignore