added git ignore file
added the missing asterisks
added the Joomla folder
 added git ignore file
added the missing asterisks
added the Joomla folder
fixed merge conflict
Merge pull request #1 from romrick4/Joomla

Joomla Folder Pull Request