added git ignore
 added git ignore file
added the missing asterisks
added the Joomla folder
fixed merge conflict