Added build dir to gitignore and added AS component inside Genius
Added things to gitignore and fixes conflicts