resolve all the conflicts and add new pull

src/reducers/reducer_decks.js

@@ -2,4 +2,326 @@ import { deckData } from "../data/file";
 
 export default function() {
   return deckData();
+<<<<<<< HEAD
+
+
+
+// Javascript: Common built-in methods
+
+		{title: 'Javascript: Common built-in methods', image: '../style/images/js.png',
+			cards: [ 
+				{q: 'Returns the character at the specified index?', a: 'charAt()'
+				},
+				{q: 'Combines the text of two strings and returns a new string?', a: 'concat()'
+				},
+				{q: 'Calls a function for each element in the array?', a: 'forEach()'
+				},
+				{q: 'Returns the index within the calling String object of the first occurrence of the specified value?', a: 'indexOf()'
+				},
+				{q: 'Returns the length of the string?', a: 'length()'
+				},
+				{q: 'Removes the last element from an array and returns that element?', a: 'pop()'
+				},
+				{q: 'Adds one or more elements to the end of an array and returns the new length of the array?', a: 'push()'
+				},
+				{q: 'Reverses the order of the elements of an array?', a: 'reverse()'
+				},
+				{q: 'Sorts the elements of an array?', a: 'sort()'
+				},
+				{q: 'Returns the characters in a string beginning at the specified location?', a: 'substr()'
+				},
+				{q: 'Returns the calling string value converted to lower case?', a: 'toLowerCase()'
+				},
+				{q: 'Returns the calling string value converted to upper case?', a: 'toUpperCase()'
+				},
+				{q: 'Returns the string representation of the numbers value?', a: 'toString() '
+				}
+			]},
+
+
+// CSS
+		{title: 'CSS', image: '../style/images/css3.svg',
+			cards: [ 
+				{q: 'What is CSS?', a: 'Cascading Style Sheets, fondly referred to as CSS, is a simple design language intended to simplify the process of making web pages presentable.'
+				},
+				{q: 'What are the components of a CSS Style?', a: 'Selector − an HTML tag like <h1> or <table> \nProperty − attribute of HTML tag, ex. color, border \nValue − assigned to properties, ex. color property can have red or #F1F1F1'
+				},
+				{q: 'What is type selector?', a: 'matches the name of an element type. To give a color to all level 1 headings −\nh1 {\ncolor:\n#36CFFF;\n}'
+				},
+				{q: 'What is universal selector?', a: 'matches the name of any element type −\n* { \ncolor: #000000; \n}'
+				},
+				{q: 'What is Descendant Selector?', a: 'apply a style rule to a particular element only when it lies inside a particular element. As given in the following example, style rule will apply to <em> element only when it lies inside <ul> tag. \nul em {\ncolor: #000000; \n}'
+				},
+				{q: 'What is "Z-index"', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				}
+			]},
+
+// HTML
+
+		{title: 'HTML', image: '../style/images/html5.png',
+			cards: [ 
+				{q: 'What is "placeholder" attribute?', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				}
+			]},
+
+// ReactJS
+
+		{title: 'React', image: '../style/images/react.svg',
+			cards: [ 
+				{q: 'What is closure', a: 'a thing'
+				},
+				{q: 'What is function', a: 'a thing'
+				},
+				{q: 'What is variable', a: 'a thing'
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				}
+			]},
+
+
+// Angular
+
+		{title: 'Angular', image: '../style/images/ang.png',
+			cards: [ 
+				{q: 'What is closure', a: 'a thing'
+				},
+				{q: 'What is function', a: 'a thing'
+				},
+				{q: 'What is variable', a: 'a thing'
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				},
+				{q: '', a: ''
+				}
+			]},
+
+
+// Javascript: 3
+
+		{title: 'Javascript: 3', image: '../style/images/js.png',
+			cards: [ 
+				{q: 'What is Date object in JavaScript?', a: 'The Date object is a datatype built into the JavaScript language. Date objects are created with the new Date( ).\nOnce a Date object is created, a number of methods allow you to operate on it. Most methods simply allow you to get and set the year, month, day, hour, minute, second, and millisecond fields of the object, using either local time or UTC (universal, or GMT) time.'
+				},
+				{q: 'How do cookies translate/move to the browser?', a: ''
+				}
+		]},
+
+// Vue
+
+		{title: 'Vue', image: '../style/images/vue.png',
+			cards: [ 
+				{q: 'What is closure', a: 'a thing'
+				},
+				{q: 'What is function', a: 'a thing'
+				},
+				{q: 'What is variable', a: 'a thing'
+				}
+			]},
+
+// DOM
+
+		{title: 'DOM Fundamentals', image: '../style/images/dom.png',
+			cards: [ 
+				{q: 'What is closure', a: 'a thing'
+				},
+				{q: 'What is function', a: 'a thing'
+				},
+				{q: 'What is variable', a: 'a thing'
+				}
+			]}
+	]
+
+// webpack
+
+		{title: 'Webpack Basic Concepts', image: '../style/images/webpack.png',
+			cards: [ 
+				{q: 'What is Webpack?', a: 'Webpack is the go-to web development tool nowadays for getting all of your CSS and JavaScript files to become one.'
+				},
+				{q: 'Result of Webpack called as? ', a: '«bundle»'
+				},
+				{q: 'which script automatically generated by webpack?', a: 'dist/bundle.js Webpack is going to create this file'
+				},
+				{q: 'How many commands line option takes in webpacks?', a: 'two params: the entry and the output'
+				},
+				{q: 'Commands for watch in webpacks?' a: 'webpack --watch or webpack -w'
+				},
+				{q: 'Only language that webpack speak is?' a: 'JavaScript that’s the only language webpack speaks'
+				},
+				{q: 'which preprocessor loader refer?' a: 'preprocessor such as Sass, or a transpiler such as Babel'
+				},
+				{q: 'If you install any new package webpack know where is that package?' a: 'yes'
+				},
+				{q: 'What is a new in webpack 2?' a: 'webpack 2 brings native support ES6 Modules. This means webpack now understands import and export without them being transformed to CommonJS'
+				},
+				{q:
+				},
+				{q:
+				},
+				{q:
+				},
+
+			]}
+
+// LESS
+
+		{title: 'LESS Basic', image: '../style/images/less.png',
+			cards: [ 
+				{q: 'What is LESS?', a: 'LESS is a CSS pre-processor that enables customizable, manageable and reusable style sheet for website.'
+				},
+				{q: 'Who is the inventor of Less?', a: 'Less is designed and developed by Alexis Sellier and Dmitry Fadeyev.'
+				},
+				{q: 'LESS is Cross Browser friendly? ', a: 'Yes'
+				},
+				{q: 'In LESS you can define variables?', a: 'Yes'
+				},
+				{q: 'What is "Mixins" in LESS?', a: "In LESS it's enables us to use an existing class or ids and apply all it's styles directly to another selector"
+				},
+				{q: 'You can use Nesting and Scope In Less?' a: 'Yes'
+				},
+				{q: 'What is nesting in LESS programming?' a: 'Nesting in LESS programming specifies the clustering of statements inside other statements.'
+				},
+				{q: 'How to create a Less file and where to store and compile it?' a: 'You can create a Less file with a ".less" extension'
+				},
+				{q: 'What is the use of data URI in LESS?' a: "Data URI is a technique that allows developers to avoid external image referencing and instead embed them directly into a stylesheet."
+				},
+				{q: 'Less uses JavaScript and processed which side?' a: 'at client-side'
+				},
+				{q: 'How to define Variable Name in LESS?' a: 'Variable names are prefaced with the @symbol'
+				},
+				{q: 'What is the use of &combinator in Less?' a: '&combinator concatenates nested selector with the parent selector'
+				},
+				{q: 'What is the use of e() function in Less?' a: 'The e() function is used to escape a value so that it passes straight through to the compiled CSS, without being noticed by the LESS compiler.'
+				},
+				{q:
+				},
+
+			]}
+// Bootstrap
+
+		{title: 'Bootstrap', image: '../style/images/bootstrap.png',
+			cards: [ 
+				{q: 'Explain What Is Bootstrap??', a: 'Bootstrap is a framework for building the rich web applications with minimal effort. This framework emphasis more on building mobile web applications.'
+				},
+				{q: 'Who Developed The Bootstrap?', a: 'Mark Otto and Jacob Thornton at Twitter.'
+				},
+				{q: 'What is Contextual classes of table in Bootstrap? ', a: 'The Contextual classes allow you to change the background color of your table rows or individual cells.'
+				},
+				{q: 'What are Bootstrap media queries?', a: 'Media Queries in Bootstrap allow you to move, show and hide content based on viewport size.'
+				},
+				{q: 'How can you order columns in Bootstrap?', a: "You can easily change the order of built-in grid columns with .col-md-push-* and .col-md-pull-* modifier classes where * range from 1 to 11."
+				},
+				{q: 'What is a transition plugin?' a: 'The transition plugin provides simple transition effects such as Sliding or fading in modals.'
+				},
+				{q: 'Which class is used for basic button group?' a: '.btn-group class is used for a basic button group. Wrap a series of buttons with class .btn in .btn-group.'
+				},
+				{q: 'Which class is used to draw a toolbar of buttons?' a: '.btn-toolbar helps to combine sets of <div class = "btn-group"> into a <div class = "btn-toolbar"> for more complex components.'
+				},
+				{q: 'Which classes can be applied to button group instead of resizing each button?' a: '.btn-group-lg, .btn-group-sm, .btn-group-xs classes can be applied to button group instead of resizing each button.'
+ 				},
+				{q: 'How will you create a vertical pills navigation menu?' a: 'You can stack the pills vertically using the class .nav-stacked along with the classes: .nav, .nav-pills.'
+				},
+
+
+			]}			
+
+	]	
+
+=======
+>>>>>>> ad06fdea93e2429ae7a9d84e66463025f3f90ff9
 }