correcting .git merging errors
styles link in three intro
add tests to modules and factory