merge conflicts
rebase merge
Adds regx file
merge conflicts
Merge branch 'master'

Conflicts:
	client/styles/main.css