coding standards
code standards review
Added global timeline acceptance test
Merge pull request #31 from ardnet/activity-page2

View global timeline of actions [2]
Added comments acceptance test
Merge pull request #32 from ardnet/collab-entry2

Comments on a notes [2]
Removed the category for the search result for now
Merge pull request #33 from ardnet/search-result-addition2

Added author, title, and category name in the search result [2]
Removing username requirement

Username is a redundant unique field to have, we can go by with only email, and the user can always write his own full name in his profile later if he wishes to.

Users should be able to login using their email, removes the confusion of remembering which username did you choose for this service, rather than the primary email you always use.
Merge pull request #29 from bernardodiasc/standards

coding standards
Merge pull request #34 from shadyvb/patch-1

Removing username requirement
information updated on contributing.md
added more information on CONTRIBUTING.md
this fix a error throwed when the main scss file is empty
moved 'work journal' notes out into a separate doc
starting to define requirements for the first prototype
Merge pull request #36 from bernardodiasc/scss-content

this fix a error throwed when the main scss file is empty
Merge pull request #30 from bernardodiasc/contributing

information updated on contributing.md
Add story about syntax highlighting in markdown.
Fix typo in doc.