Merge pull request #3 from Venture-TheSphinxTeam/dev

Dev into Master
Merge pull request #5 from Venture-TheSphinxTeam/dev

![](http://i.imgur.com/ZEL6ju0.png)
Merge pull request #6 from Venture-TheSphinxTeam/dev

Removed jumbotron
Merge pull request #8 from Venture-TheSphinxTeam/dev

Like I wouldn't merge a pull request I made myself...
let's not use the test db
Update application.conf
Conf remove
Merge branch 'master' into dev

Conflicts:
	.gitignore