application.conf
resolve application.conf conflict
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
Merge branch 'master' of github.com:PureHacks/KudosBoard
make email more pleasant, sort by date functional
Merge branch 'master' of github.com:PureHacks/KudosBoard